made cleaning up optional