Removing deleted files from v18.4.0