Any sense of whether all the commented-out stuff in this file is still necessary? Can we clean it out, do you think, or safer to leave it around for a while in case we need to pull bits back in from it?