Removed obsolte cleanup() method.