Comments out some lines for now