Removed some bits and simplified others.