Changed cleanup procedure to work