more clean ups
wip