commenting out some more pieces