code cleanup after merge -jx