Removing shift usage