Remove CustomWebClient
Clean up