Remove custom deceleration logic for now