Clean up Factory