More clean up from merge