removed more proxy stuff