Stripped out some extras

Going to try and make proxy actions work in a minimal context before
adding more.