More code cleanup and cruft removal.