Remove token checking because it's a pain