Added debugging and skip cleanup