Remove more drupalisms from Edge SDK