datetime refactoring
Delete unused class