removed unused interface
added missing annotations (fixes #139)