Clean up ready for merge