Clean up strict notices