ItemWork and config cleanup