- cleanup, removed objectlocator