DX APM - Removing service data and fixing partitioning