Some command cleanup