Make cleanup() method public