Remove BaseModel since it not adds any value anymore