cleanup, evolving model, wip
cleanup old stuff