Remove token dependency