Warning removal and uniformization