CHANGED: removed soft-link code from master