just rethrow exceptions
remove not (yet) working methods