Removed references to Response object