Got rid of unnecessary uniform.