Remove immediate prop, set default time val

Change-Id: Iacbb3fd9b3b0c769a4ddfa5f841fbe0d9fb4f17a