Cleanups from merge