Remove HTTP assumption