Remove other signal handling calls aswell