Issue 139

I think we are done :grinning: . Have a look at it :eyes: 
+1 this file is better removed...