Merge pull request #1313 from waja/check_ntp_time_remove_unused_variables