Remove some cleanup code left for backwards compatibility.
Add top_tags table that will be used later...