removed proxy stuff, apparently unnecessary