Removed TagAPI Dependency