Remove dependency on CPP