Remove superflous methods.
Merge branch 'develop' into json-ld