michael: trainer: some clean-up