Cleanup new velocity version