Mostly refactoring

- remove support for watch online link
- use new facilities from java core library
- delete code that dublicates core library
- minor refactoring