Cleanup
Using HiPE
Changed `clean` locations, might means smaller uploads.