Removing http dependencies