Ensure that optimizer params and trainer params are aligned

[sgreenbury]

Currently there can be overlap between parameters in the optimizer and directly in the trainer config - these should ideally be aligned with precedence determined.