Remove timing calculations

Addresses #33
Addresses #34