ops, cleanup after merge