Take out references to date, make more generic.