Removed some more middleman cruft.