Remove debug code preventing cleanup