Remove reference to internal infrastructure