Remove some unused stuff.
Add space between multi-file headers.