preliminary tidy up
Created by: eileenmcnaughton
Previous PR won't merge because 4.5 stuff was merged in before this - so this is the first commit re-cleaned
Created by: eileenmcnaughton
Previous PR won't merge because 4.5 stuff was merged in before this - so this is the first commit re-cleaned