Couple cleanups related to ocata update