Cleanup ObjectHolder a bit