Improve cleanup