Remove crap, improve file headers.