Fix missing object identifier. cleanup