Removed dependency on choco