Removed commented out code.
Simplified code in ValueDateCalculator.