Removal of time sanity checks