Fixed persistance of time zone
remove useless comments