Remove unnecessary Date wrapping