Removed nasty optional protocol for now until I find out how to support default arguments.
Merge branch 'feature/bandedo/protocol-removal' into develop