minor updates to remove GAE