Some more cleanup
Merge branch 'super-famicom'