Additional FB_13 cleanup.