Refactor: Removed Protocols code