[user-session] cleanup, use only new targets

Signed-off-by: Pekka Lundstrom <pekka.lundstrom@jollamobile.com>