Improve memory management and remove useless variables
Improve memory management and remove useless variables

media-explorer/media-explorer,media-explorer/media-explorer,media-explorer/media-explorer,media-explorer/media-explorer