Scaffold removals

@michellechu77 @nicollequintero