Ditching more cases where ObjectID needs to go