Cleanup for zip installable skin -step 1.2