Clean up around warning on everything