Merge branch 'remove-easy-mode' into my-master