Removed Proxy and Fixed TBP