Remove more protocol references