[CLC-506] More unnecessary lines