Remove some unused code

Removing some unused code