add cleanUp() method