[CLC-1715] Remove unncessary logic