OP-1222 Fixed a merge accident.
Some cleanup.