Oak Index Manager - cleanup