ISSUE-#2 has been completed. Removing avatar has been added