Trying to remove dep cycle