Get rid of pk and model since they were removed in mapentity