Some non-material cleanup