BDD ref cleanups.