removed some unecessary scaffolding