code cleanup after merge