Removed silly commands; fix a couple others.