Further cleanup.

(You merged too quick, lol)