Fixes for removing more old code.