Commented out some lines that relate to the synapse.query generator issue.  This is still in progress.