Cleanup, removing unused sub proxies. Left ego and adv (but with contents commented out) for now so i can quickly look at the constant matching they were using.