Index: branches/fc20-dev/ldap/el/config/etc/nagios/check_afs
===================================================================
--- branches/fc20-dev/server/fedora/config/etc/nagios/check_afs	(revision 2554)
+++ 	(revision )
@@ -1,22 +1,0 @@
-#!/bin/sh
-. /usr/lib64/nagios/plugins/utils.sh
-
-if [ $# -ge 1 ]; then
-    CHECKS=`/usr/bin/fs checks -cell "$1" -fast`
-else
-    CHECKS=`/usr/bin/fs checks -all -fast`
-fi
-
-STATUS=$?
-
-$ECHO "$CHECKS"
-
-if [ $STATUS -gt 0 ]; then
-    if $ECHO "$CHECKS" | grep -i COCYTUS >/dev/null; then
-	exit $STATE_CRITICAL;
-    else
-	exit $STATE_WARNING;
-    fi
-else
-    exit $STATE_OK;
-fi
Index: branches/fc20-dev/ldap/el/config/etc/nagios/check_cron_working
===================================================================
--- branches/fc20-dev/server/fedora/config/etc/nagios/check_cron_working	(revision 2554)
+++ 	(revision )
@@ -1,2 +1,0 @@
-#!/bin/bash
-exec /usr/lib64/nagios/plugins/check_file_age -f /afs/athena.mit.edu/contrib/scripts/cron_scripts/cron_status_flag/$(hostname -f)
Index: branches/fc20-dev/ldap/el/config/etc/nagios/nrpe.cfg
===================================================================
--- branches/fc20-dev/server/fedora/config/etc/nagios/nrpe.cfg	(revision 2554)
+++ branches/fc20-dev/ldap/el/config/etc/nagios/nrpe.cfg	(revision 2572)
@@ -218,10 +218,5 @@
 command[check_procs_postfix]=/usr/lib64/nagios/plugins/check_procs -w 1:128 -c 1:256 -u postfix
 command[check_postfix_mailq]=/usr/lib64/nagios/plugins/check_mailq -w 500 -c 1000 -M postfix
-command[check_afs]=/etc/nagios/check_afs
-command[check_afs_athena]=/etc/nagios/check_afs athena
-command[check_afs_sipb]=/etc/nagios/check_afs sipb
 command[check_cron_working]=/etc/nagios/check_cron_working
 command[check_ldap_mmr]=/etc/nagios/check_ldap_mmr
 command[check_kern_taint]=/etc/nagios/check_kern_taint
-command[check_backend]=/usr/lib64/nagios/plugins/check_ping -H 172.21.0.52 -w 500.0,30% -c 3000.0,80%   # sql.mit.edu backend IP
-command[check_smtp]=/usr/lib64/nagios/plugins/check_smtp -H localhost -f scripts@mit.edu -C 'RCPT TO:<scripts@mit.edu>' -R 250