removed scaffolding code