cleanup and wip more cleanup