Code optimized

Comented out some parts of code ( that could be obsolete. Saved 44
Bytes.