Add end cleanup