I do not remove that code, i move it up. See line 41-50