remove all old-time references, i.e includes