Cleanups for next push