remove unused class
more verbose
no duplicate disconnect
remove ENABLE_DEBUG_REPORT / heavily cleanup