further cleanup of training fixed