Remove dead code
Cleanup licence and attribution headers