Remove serverAPI references