Deleted stuff
Merge branch 'feature/jmknew' into develop