removed proxy setup
merged