Improvement/3.x/managementservicecleanup