Scaffolding cleanup + projects done