Comments out some unneeded 1.0 only code