Tidy up Command Manager.