Cleaned up category and tags and their links