command cleanup
More command cleanup