Remove empty properties keyed off the ID