Fixed a few hotspots.
Removed an unneeded file