Cleaned tons of unused code. Most of it existed around ProxyContainer, and only 5 lines of it was needed.