Remove unused files.
Adding simple tagging.
Fixing tagging issue.