fix schema to remove pollution from other branches