Removed http classes related to http expectations.
Updated code based on the code review.
Still work in progress