cleaning out unused code, old comments