#6359: Clear out old code.