Removed extra scaffolding, fixed #2