Merge pull request #252 from Useful-Innovation/johans-fixes

removed unnecessary code