Minor cleanup: removed unused attributes.
Minor cleanup
Resolved define which was used only once.
Platform dependent code to set system time separated.