Remove old data code