RapidFTR (Sumit/Nazneen) Removing the dead code.
Merge remote-tracking branch 'upstream/master' into profile_thumbnails