Remove singleton reference