Added cleanup method