Revert "Revert "removing data symlinks before creating them""

This reverts commit 24f348949fc09c73352e3281852a42e631823a7f.
Merge branch 'master' into develop