Remove old table code