Cleaning up Command processing.