Cleanup of uniforms