Massive command cleanup