Removed comperio-specific components.