Make warning cleanup