Remove more facades

Let's rip out these too. :)