removed unneeded relpacement
Merge pull request #23 from devbliss/refactor/optionalTimestamp

refactor/optionalTimestamp