Revert "Merge branch 'avatar-removing' into 'develop'"