cleanup
broke it, wip need to fix