Remove repeated compliance calls