Re-enable profiling.
Formatting fixes.
tabs -> spaces.
Clobber unused methods.