Removed dependency on WebAPI