comments cleanups (todo) and lose BWA for recent Mapping<> cleanup (op== req)