Cleanup repackaging