[CS] More efficient Guard
[CS] Remove Guard gntp notifier