Revert "bugs fixes for timestamp (minor)"

This reverts commit cffa1a07926e3c1e19098bfa9bde41a50d5af4c7.
Revert "new model implementation"

This reverts commit 48eacaa77d0043f0dcaefefea15b90771ee0a696.