Removing reference to imaginary TERM_START and TERM_END numbers