More deploy cleanups.