Clean up bucket mod