Getting rid of redundant Finds