Cleaning Handler.Calendar after refactorings