diff --git a/app/lib/Angel.coffee b/app/lib/Angel.coffee
index c504ee802..39059ea7b 100644
--- a/app/lib/Angel.coffee
+++ b/app/lib/Angel.coffee
@@ -238,10 +238,7 @@ module.exports = class Angel extends CocoClass
     work.testWorld = testWorld = new World work.userCodeMap
     testWorld.loadFromLevel work.level
     if @shared.goalManager
-      # TODO: Do we need to create testGM via @shared.goalManager.constructor for some scenario?
-      # TODO: It breaks IE9, because @world is undefined in GoalManager.initThangTeams()
-      # testGM = new @shared.goalManager.constructor @testWorld
-      testGM = new GoalManager(work.testWorld)
+      testGM = new GoalManager(testWorld)
       testGM.setGoals work.goals
       testGM.setCode work.userCodeMap
       testGM.worldGenerationWillBegin()