angshu| #1085| removed login/auth related code, and integrated with user authentication