Clean up obsolete code from file