remove more PROTECTED macro usas