Cleanup cloning and search functionalities