Don't abort on error
Remove useless instructions