Proper media type implementation
Remove some obsolete images