Removed support for deprecated finder sql

To keep the diff sane I did not fix indentation in the first commit. In the second commit indentation is fixed. This is so that one can see the diff in the first commit without all the indentation noise.