removing some more scaffold stuff