Removing VelocityGenerator duplication