Removed exit status stuff