Rename unlink for remove

issue3457
review2281002