Timezone fix / cruft removal to fix Travis