cleanup and feature -> token transition