Made cleanup public