Safety fix: clone DateTime internally
Removed unused constants