restore right shifts by zero, more clean up