Cleaning up code.
deleted old files
Deleted deprecated code.
Fixing merge conflicts
Merge pull request #240 from steinernein/dev

Cleaning up code.
Merge branch 'dev' into minorChanges