Clean up CommandController utlity