don't remove until the last moment in the calmd command