Update to 0.13 syntax changes
Remove token from users for now