More changes made to TorService() and code moved around and deleted to get final notification without using any deprecated code