Merge "Removing bogus file added by mistake"