remove unnecessary hidden fields + fix time guess