The system dataset is no longer a symlink.  Clean up the code at the same time.