Remove timing calculations