Removed gadjo dependency