Removed dependency on external library