schematic cleanup