Removed generated file and fixed cleanup