Now cleaning-up trainer routines.  I tagged the last commit to make sure that I could get back (easily) to the old trainer versions.