Remove dead code.  Begin to clean up formatting.