more cleanup in modules