removing extend refrences/uses