Remove protocol check