Removed exit statements