Removed duff dependency