Remove dependency on ProfileService from ProfileBuilders