More command cleanup