[TIMOB-15000] Clean up code
Merge pull request #144 from vishalduggal/timob-15000-32X

[TIMOB-15000] (3_2_X) Clean up code