more tidying up after the interface changes