Also took this file out of the 'build' folder, now that all code in here comes from elsewhere. This also removes a few dead declarations.