Remove dependency on lizard-map