Optimizing Files and cleaning up more Redundant files