Updated to cleanup at any exit point