Proper cleanup