removed unused method-definitions and fixed enum mismatch
Merge branch 'master' of https://github.com/ufz/ogs