clean up scaffolding
Merge pull request #1 from TimButokawa/clean-up-scaffolding

clean up scaffolding