cleanup + tokens with rules (started)