Manual update to last merge SHA
Ues cls.glconfig
Remove a bunch of LEGACY_PROTOCOL blocks