Somehow merging brought in some old code. Tried to restore it