Upgrade to Taggit, overall cleanup