Finished pass one of cleaning up files, do destructors next