No more first_th and last_th - as per #624

Signed-off-by: emanuele <emanuele45@gmail.com>