Cleanup unneccesary stuff
Merge branch 'develop'