some WIP cleanup on Master for DBN IR