A bit of a tidy up, shedding old code from master branch