Further cleanups from merge