CommandManager cleanup