removed some stuff
Merge branch 'features'