added cleanup method