Cleaned up code

-Removed all unused code