Remove guard dependency