More abadger cleanup notes