Removing unnecessary NO-OP implementations and updating config to
exclude unnecessary classes for DI