/usr/sbin/scap-2 no longer exists

Also remove obsolete comments.

Change-Id: I4636b0b0e256750cdc167ff25564d6fa34fe131b