halfway through refactor...
cleanup unused code