removed directory controller, delegate fixes