Remove dependency inference