Removed Product Matrix Extension as it is now part of the core