Clean up warnings throughout