Rename tags table.
Removed unused defs.