Cleaned up yet more code
Merge origin/master