Remove some unused Code