Cleanup

No functional changes.