Rework all the clamp delegates