massive References cleanup