Removed unneeded protocols