Got Media plugin to work fine & did some cleaning