#462: cleanup the shift feature