Move validation from calendars to shim