cleaning code

Unnecessary code removed