update to Version 1.6.2
Finaly removed CHack
Remove deprecated and unnecessary stuff + remove trailing whitespaces