more cleaning from the merge

how did I miss that mess?