Cleanup from previous changes.