Remove some unused code