Remove dependency on dragonfly