Cleanup in curent_user.inc/session.inc