Removed scaffolds for real now...