Remove dependency on config