shorten cleanup procedure