Removed most of the code from assemble_data() - the auto NOE analysis is now completely different.
Authored by: bugman 2011-07-18
Parent: [r13697]
Child: [r13699]
