Clean up unused warnings