Remove unused signal
Fix time diff subtraction