Protocol cleanups.