Dead code removal
Merge branch 'master' of github.com:toejamhoney/thisneedsacoolname