Cleanup

removed TODO, compiler warnings, unused NetWatcher class etc.

Big change was creation of StaticSafeHandler as a new pattern to avoid
memory leaks commonly encountered when using an inner-class Handler.