Revert "Calendar toCurrentWeek and clearFields"

This reverts commit 0544b53fc781b9c4e335bf7bd4bcff40c0a42c7b.