Remove some fragments after testing for compatible analysis w/ initial version.  Everything essentially works.