Removing the cpm thing since it appears it will be incompatible