Codechanges and remove old WB 2.7 and prior code.