Remove FindsByElement and such

If this is needed will be in a different pull request