Revert "NPE SCM Polling"

This reverts commit 9b4679ad6978a7820c0391f5429dcca5ccf10fb3.