Clean up more 'extract' work