More work on XMP stuff.
Removed XMP related code.