updated clean up