[Code] More cleanup.