Update standard signal handlers
Remove unecessary method