Fix remainders from merging

A few merging conflict lines accidentally entered the code. Removing.