MagicWord: Remove some commented-out code

Change-Id: I62014cd09b4033be0c958da2527911368fff141a