Refitted remove commands with criteria munging