Removed dependency on the Controller's web services objects.