Removed all traces of old trainer impls