Make Yi.Core less kitchen-sinky.