Remove dependency on pointed