Improved Cleanup