cleaned code

Removed unused code