More Schematic cleanups