cleanup calendar constructor
first steps toward global objectId