horrible wip - cleanup