Removing unnecessary dependency on velocity