add feature: remove time gener