tidying up from the merging