annotate
users and user sessions cleanup and reorg