Removed some old crap; cleaning up