Remove more unused includes and commented-out lines. Disable debugging statements.