Removed unwanted codes and made few changes to MediaEntity