Remove remaining reference to Guard