remove validFrom for now