Adding cleanup method after run