Update of file headers and removal of unnecessary code