bit of cleanup after merge