more schematic clean up