Get rid of dependency relatoionship