Cleaned pins scaffolding even more