Schematic Cleanup and Clarifications