urls were hard-coded
better names
remove old supersedes