more cleanup from the conversion