Schematic cleanup