moar command cleanup