Fix --cleanup method