cleaning up demo #2