remove some cruft
Tidy up how uniforms are set