Removed unused delegate
Removed unused media