Proxy and Code Cleanup

Added @SidedProxy (finally)
Removed unnecessary code