Some code cleaning

Removed old commented code and some other garbage
Other code cleaning
Fixed stupid sintax error :-)

Fixed stupid sintax error :-)