Cleanup before Herburt

Main code cleanup before "Herburt" branch