cleanup: singleton
date fix