Cleaned up some unnecessary stuff
Merge branch 'develop'