Removing some bits that are no longer necessary