Build config cleanup