wip - more cleanup