Removing shift usage

A few more shift usage removed.