more code cleanup.