Removes useless return statements
Adds search replace db finder - Ref #8