More time sources cleanup