remove some steps related to logout function