Fix references after cleanup attempt