wip misc cleanups