Removed proxy stuff