Timezone stuff, cleanup and cruft removal