Remove hack in uniforms