Some fixes , use common session bus, remove old variables and unused loops