Killed Database.Persist.EntityDef
Remove two .Query modules