Remove extraneous include, and backup files