GK: not uglifying
GK: cleanup