More code removed for Calendar V1