fix flute, and remove test code