use generic clarinet & trumpet in jazz cat

also cleanup d clarinet