Removed yolk dependency, it's not required