More js literal removal