Fixed and Optimized Cleanup Buttons