Changes to let scholar be enabled, strip out some cruft.