removed amplitude uniform because it is not used
Merge remote-tracking branch 'nhalloran/dev' into dev