Remove dependency which is creating a circular dependency