diff --git a/tfjs-core/src/train.ts b/tfjs-core/src/train.ts
index b8c06acb06..b470ae8a78 100644
--- a/tfjs-core/src/train.ts
+++ b/tfjs-core/src/train.ts
@@ -15,26 +15,6 @@
  * =============================================================================
  */
 
-// So typings can propagate.
-import {AdadeltaOptimizer} from './optimizers/adadelta_optimizer';
-import {AdagradOptimizer} from './optimizers/adagrad_optimizer';
-import {AdamOptimizer} from './optimizers/adam_optimizer';
-import {AdamaxOptimizer} from './optimizers/adamax_optimizer';
-import {MomentumOptimizer} from './optimizers/momentum_optimizer';
 import {OptimizerConstructors} from './optimizers/optimizer_constructors';
-import {RMSPropOptimizer} from './optimizers/rmsprop_optimizer';
-import {SGDOptimizer} from './optimizers/sgd_optimizer';
 
-// tslint:disable-next-line:no-unused-expression
-[MomentumOptimizer, SGDOptimizer, AdadeltaOptimizer, AdagradOptimizer,
- RMSPropOptimizer, AdamaxOptimizer, AdamOptimizer];
-
-export const train = {
-  sgd: OptimizerConstructors.sgd,
-  momentum: OptimizerConstructors.momentum,
-  adadelta: OptimizerConstructors.adadelta,
-  adagrad: OptimizerConstructors.adagrad,
-  rmsprop: OptimizerConstructors.rmsprop,
-  adamax: OptimizerConstructors.adamax,
-  adam: OptimizerConstructors.adam
-};
+export const train = OptimizerConstructors;