-small fix of service discovery showin null entry
-clean up some toggled old code