Removed an uneeded file
A bunch of cleanups