Stuff
Cleaned up some unnecessary stuff