Support MS removal and cleanup thruput