Clean up scaffold

clean up scaffold and old cruft