Clean up token statement
rebuild parser