Trying to remove dep cycle some more