Iinitial warning cleanup