Removed unused try structures and reverting search list