those links should be obsolete after removing the above stuff