Removed deprecation warnings, kept only the calendar