Changed: abort & cleanup