Hologic, Conceptus drop non-patent claims from lawsuit