Remove velocity reset

Fixes #1373