Removed additional dependencies on httpcontext