Clean up on factory util