minor cleanup before final push