Removed some excess code and files!