TRAINING-36: Removing more code that trainees need to add