delete old stuff
Merge pull request #853 from solispauwels/master

delete old stuff