WIP: model cleanup.