misc cleanup after merge