[user-session] cleanup, use only new targets