significant cleanup of schematic