cleanup
WIP getting ahead of myself