Remove debugging and fix calendar date issues