Comment out some partial old code