Clean up Handler Factory