Added clean up