Cleanup: remove some benign mismerges and obsolete comments