Cleanup extract