cleanup

extractions are done with extractSource() now, and I removed a bunch of
extraneous, commented out alerts in catch blocks.