Remove some dead, non-compiling code, and do some formatting tweaks.