TODO's removed. fixed bug then unmapping scoped proxies.