Fixing home cleanup