* More cleanup prep for freebusy overhaul