*GeneralCommands: cleanup