Removing unneeded variables
Mostly made the changes for the next method of loading the calendar. It is not tested, but there are no errors.