refactor once-date optimization

*   make it cleaner
*   remove races
remove leftover line

remove a line that should have been removed previously