More nonfunctional cleanup