Fix __remove