Removed weird scaffolding