Consolidated obsolete files to avoid confusion