remove refrences to legacy methods