clean up primer3 cruft and remove remaining patch code