Cleanup, found Hawk.js Bug