more cleanup and languages