Remove token and fix split