pins scaffold cleanup