[ModernApp] Cleaning up Flickr bits