beginning cleanup: A–D