Removed duplicate type definitions
Also removed accidentally-reintroduced TrainingParams type
Merge branch 'master'