Cleaning code

Deleted unused or commented code