VanirConstants: remove junk from the trunk

Change-Id: I564260988523a2210623955d6aa3a5e3dfced1ef