More cleanup to address #2