falling back to rm if unlink is absent
Merge branch 'dev' into dev.xml
API 3 wip