Removed general time model and general timestamp