Add locking (due to RUNNING etc.) on remove so that can safely remove symlinks