Removed unused code
Removed some unused code
Removed some unused code