Remove the 'global flickr' in handlers