More cleanup in Auto section