Cleanup for user bean

Signed-off-by: Arpit Gautam <arpit.gautam@outlook.com>