restored cleanup