Removed excess code
Merge branch 'master' of https://github.com/sim642/blah