Flickr: clean up based on suggestions