[TIMOB-1510] Code Cleanup