Remove some unnecessary bits