Major cleanup, courtesy of gprof -c.

Nothing removed was being called.  Validated.