Removed some signal handlers