cleanup after merge, seems OK