Removed scaffold left overs.
More scaffold cleanup.
Merge pull request #2682 from ADmad/3.0-remove-scaffold

3.0 scaffold cleanup