Additional Auto section cleanup