Removed events dependency