More clean up changes.