Revert "added new scaffolding"

This reverts commit dc9259444c4ce4a7d0efcf196c54213b4036ee2e.