cleanup prep for next token refactoring