ARQ-1492 Removing @Deprecated Enhancer SPI