wip. cleanup