Cleaned up a whole lot of crap
Merge branch 'feature-cleanup' into develop