clean up command validation