Small obs class cleanup