Removing unneeded protocol
Functional tests passing for both implementations