Cleanup

No substantive changes.