Removed calls to old JS