Cleanup and ignore 52X error