update default find() function to latest
remove old local declarations on methods