CODE: Remove vestiges of old merge conflicts