Removal of global references
File cleanup