I think this file is simple enough that we can kill it off. Any objections @haacked?