Removing signal handling, it doesn't belong here