Remove dependency cycle