Cleaning up ready for recode