Tidy up last action tracking