#1172 idb code cleanup