Clean up scaffold

cleaning out a bunch of old test code and scraps from scaffold