More cleanup. Finalish version.