cleaning out old stuff from before the refactor