Remove time dependency. Issue #30.