gendb: more AUB fixes
rnn: clean up deaub