And removed UnitTest for removed bit of code.