SYMPHONY-1770 Cleaned commented-out code.