More clean up for merge