#957 Remove Scaffold Links

Resolves #957