Cleanup factory search