minor cleanup after merge