Remove old hacks from training setup