Cleaned up code and deleted some unnecessary files