Some more manifest trimming