FIX config cleanup