Keep the old code commented out, just in case