Move config cleanup