Stripped out unnecessary codes

Stripped out of unnecessary code