more cleanup of gnotty