removed debugging junk, finished #165