Removed some redundant code related to shift emission