Removing MediaType
Removed some magic number