more post-quilt-era cleanup