Fix for 1.6.0_30 (HSZK love), cleanup, cutting fix