Tidy up ready for merge
Tidy up for Merge