Removed some unused code
Removed unwanted code