[Code] More code cleanup.