Remove some unused pieces