Added cleanUp event