Added simple.disconnect to end of cleanup_after method