Improved cleanup code.