Cleanup of all #! headers that are not needed for module files.
Merge remote-tracking branch 'mpmaster/master'