Further cleanup of super() call and enhanced __del__ logic