Fix trajectory support in master
Remove acceleration in trajectory mode