Revert "Something slightly reminicent of a beginning of an API"

This reverts commit 952c4446d014b207b4b71f00e1740bfc73a2f5a3.
Existing functionality was in use by iOS-app and shall not be changed.