Removed some proto functionality that was hopelessly broken