Remove dead command and clean up some coding style stuff.