Moved clean up methods to the execution listener