BOObjectManager has been cleaned
Merged BOObjectManager cleanup with master