Removed unused includes and fixed protocol identification