wip, cleanups