warnings/strict cleanup