CODE: More code cleanup.