Applying all the shuffling around to the program type listing and editor.
Removed all that remarked out code from the header.