wip: slim down core model