Simplify time machine, remove redundant methods.

Strategy is not needed, you either are in TimeMachine block or not and
that impacts the result of the query.