Cleanup. Removed RPC code! :D