more cleanup #117