oa_base cleanup