Removed HTTP client function & cleanup