Logout bug fix && remove unnecessary ctrls & srvs