tidying up some old commits