Remove dependency on Hoek