ENH: MEG and EEG run, but incorrectly
ENH: Cleanup after rebase