Revised pinned/collapsed cleanup