Remove dependency on request