Open Collar 3.9 tidy up before start on new Project 4.0