Updating to remove capacity info, ensure APIs don't mix service class calls