Remove unused protocol fields