[PLAT-6666] Using ArgumentChecker per review
[PLAT-6666] Removing unused code
[PLAT-6666] Using TimeCalculator per review