BaseModel: remove some dead code