just tidying up after messy merge