Get rid of some troubleshooting code and make commands more uniform.