More cleanup. Autoscanning taking shape.