Remove dead code related to old protocol