added defrag to Uniform2D
Remove unneeded feature gates