Changed CleanupHandler to DetatchHandler