removing dependency on kami