Removed unused stuff
Merge branch 'stuff'