Add indicator and remove user data

Add indicator and remove user data