Removed wrench dependency