Removed dependency on YADR, although I'm still using a lot from that repo