Remove as a dependency to avoid circular dependencies