Remove dependency on GMaps API