Cleared unused code
Cleared unused code