second round of cleanup before demo #2