Removed useless scaffolding