Removed extra code and let the framework do its work with respect to current timestamp.