Removing dependency on honey-auth